Form Extension refactoring + updating collection management + some docs...