Added base device registration