Simplify containers, better abstract container, handle simple metrics