Enhancing Database codes...