added new features to router class