Updated Stop and added directory support