Added entity fields