could you work on a PR for adding the mapping support and removing the exception?