Complete model for expression

 - yield expression
Minor fix
Small refactor