Add support for a second type of accounts