Support do override some constants
Added support for type list fields