Fixed mapping, added nullables etc