Added YAGNI considerations