Fixes on mapping, exception handling, new templates created