Updated code to use data holder interface