Move add functionality into module