Added some readonly modifiers