Added missing files to support "new" features