Added DataMapper, Calendar Integration