Add property file. Fix code. Add annotations @Required and other.