Add sound support
Add missing state
Build fuctions simplified