Change all mapping to non recursive