Code enhancments