Added service class (needs work)