added some service methods
merge fix