Added helper class, changed return type for properties