Add Model for class Argument and fix events