Features and steps added