Added static data and new schema objects