Issue #37 Banner services allow null Language

* Also improved mapping definition