Better comments and custom labels