Updates to Profile7 support