Make method fully chainable
Update specs for wrapper