Added categories, and migration