Added getters and setters to some types and generics