Move types into actual classes