Further DB development