Updated a couple of methods to be more in line with generic service method pattern...