Big updates to utility methods and events