Add accessors manually to avoid a new dependency
Prepare for release