Fix registration and import path