Add training commenting
Move extras key name to constants