Added entity structure and form customization