*FIX* added payment and accountability class