Adding define and other bits