Adding missing files and classes