Added UNIQUE keyword where necessary