add payment related data types;
refactor account structure;