More changes to profile class