Fixed implementation of data helper methods