Added mapping for activities