Refactored naming and added support for unique indexes.