Added more attributes to ActivityInstance and User object