Adding some more Defines