Added optional fields to eden branch aswell