Add extensions to support accounts