Refactored imported classes from SimpleDotCom