Added states to the front-end