Updated utility methods