Remove optional value attribute declaration
Move to constant