Some minor change on model