Improved ProgramHandler