Adding Container class to handle dot-based fetches, clean up index slightly.