ADD: Added Date and Link module