Added schedule and fee calculations