Added constants, util and defaults