Updated structure for proper auto-loading