Added custom service and alias override