Added support custom services. Closed #4