Updated doc. + Specs