Remove requirement of Base package