Removed usage of category implementation