Abstracted the error mapping
Version bump