Removed mockery when not used
Added option to add parts to composite
Merge branch 'master' into develop