Feature Files update & minor adaptions