Changed to be consistently object-oriented