Move over to module interface from service object