wip -  add relations with payment and subscriptions, resfactor some issues