fix models and map of account