Added missing methods to data classes