modified form and added partial entity file