Added more functionality to add measurements feature