Refactor message names, update date parser