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