Added basic states handling