Added a couple of mappers