more refactoring of Rebond framework