Implimented new classes