Made constants to fields