Code desing updates and improvements