Better lazy Loading and code management