Major changes, added metrics, added prefix + suffix