Added support for model action
Adding ouput + bugfix