Add primary classes and demo