Moved method to right class