[TASK] Add a few missing properties and mappings