Added some doc-blocks