Fixed an issue with marshalling.
Added in missed getter/setters.