Updated model for PostgreSQL migration