Some more feature added