Move state-data into model