Added implementation for basic services