Adding docs and some additional classes