Added payments and changed structure