Self entry moved to maintain alphabetical order