Moved StatementRegistry to its proper place
Added some more JavaDoc