Spun off two classes from Main Service