Fixed registration and categories