Move snippet to separate file
Update features