Changed DB structure to work with accountancy