Added entity, updated options