Fixed version bug and added auto fill functionality