[WIP] attribute mapping #53 #54 #58