Moved code to class methods instead of overriding instaqnce methods