Added basic states and entities