Moved data management to Utils