Initial changes to UserEntIT