Added option to specify base