Feature/671 keyword maps