Import fixes, proper initialization, lazy loading