Change modifiers to protected final