Moved to include files to remove duplication