Added new features for Sprint 3