Added new files and methods