Added gets, sets and doc comments