Added library and primary classes