Revert "Changed UID and added columns"

This reverts commit 82816f3f069b5ac993c6b766a110036e300affa9.