Add defsys & mustache