House keeping and added class for base conversion