Added initial data management.