More encapsulated design