Updated the application to disregard the order of declaration of services (relying on Imagination 1.6.1+