Adding more defines and stuff