Added r/w check for constructor