Adjusted Module to the new Saveable Interface