Made further modifications in adopting the existing code base