Improve Snak interface