Added steps support