Adds actual Profile type, simplifies some types.