Enhanced and sorted base template