Updated: More base aliases