Fixed mapping issues