Feature additions from pivotal tasks by koushik for v1.1.0