bugixes and add new mapping params