More refactoring - only include required js files