added some services and additional functionality