Fix and adopt composition operator
Add build file