Refactored finance accounts for object/array conflict