Moved general stuff to the general module