Changed up PostgreSQL classes to be even more verbose