Improve content output hook and make the system more simple