Optimize data Structure