WIP Code Value MIFOSX-36 (database changes)