Changed some function names to add getters