Added xlsm compatibility
Renamed services