Prepare for more category usage