Added "readonly" when possible