Development: added a couple of constant fields