Added methods and sample