Updated to use Base lib