Move some methods to profile
Merge branch 'distribution-plugin' into cirandas