Better code handling