Added Alice integration and fixed issue with mapping on State entity