Simplify loading via Composer

Change-Id: Idffb348d732d69f72a5ecec054413e6cd4fac59b