Added comment annotations. Adapted module stuff to be usable by mapper.