Added possibility to ignore state