Added methods and specs for Plan