Added some more configuration options and added a handy macro