Credentials, comments, empty constraints support

Improve relations support