added missing models to state loading
reformating