Added interface; Minor changes