Added NOT NULL and PK/FK constraint names