Fix catalog model issues and change id generation strategy to Identity for MySQL compatibility