Remove limitation to categories