Adding more generic steps