Changed decorators and shifted to PostgreSQL