fixed mapping and incremented version