Changed constraint from query to Object