- IMPROVEMENT: Added data holder