Fixed property name issue for timestamp
Modified a number of properties