Added support for custom service loading