Modified account to included factory for every type of account
merged