Better __construct and annotatedClassDiscovery improvements