Added custom service loading