Added support so that criteria API works with Maps not just objects