Handle profiles better