Additional changes and improvements