few store models fixed