Improve Document and add bunch of specs
More specs