Update utility functions for db and forms