Converted all states to new framework