Add data picker flexibility on mail and project;