Added methods and functions