Make new schema and java class level