Refactoring play default upstream handler

more ideas?