Update Bean functions to allow for defaultvalue returns