Feature/rx js mappings