Extend gem API, adjust specs