Added basic implementation of services