Improve feature and steps