Separate default and user header\ Improve clock system management