Added getSet, more refactoring...