Fixed Entity Registration