FIX - fixed configuration in Action class // ADD - beginning of switching to new Model