Adding readonly check