Changes required after Device moved to Public API in Core