Code constructions improvements