Changed to use @Service