Fixed circular module dependeny and added missing signature declarations.