[General] Add final modifiers