Added disabled/readonly support