Added comments and set/get