Improve snippet system

# Improve snippet system for future usage