Add bookshelf, vacuum others.
Update build