Adding MTA and server base code