safety commit - added account marshall/unmarshall support