V1.2.1 Fixed mapping issues