Changed methods to snake case