Add account factory
Fix bill factory to be proper