Added includes and config file