Added files to support new entities