Added missing files and methods