Merge #14: Division migration and tables