Added getter/setter functions, changed defaultValue to value