Imported more logic and added relevant imports to config include