Added complete spec and methods