Add support for base-4.6