Added some more enable_if macros