Added strategy in account and fix some bugs