Adding the modules for issue #118. Should be refactored to use librarian but not now