Adding table prefix and skip constraints