Extend including class instead of using class_eval