Small correction in a data implementation and implement a disable attribute.