[develop]

- Added some more macro definitions