Fix State database class