Added more utility methods