Feature/profiles improvements