added new feature with SQL restrictions for non-container types