Add 'on' and 'off' as Boolean
Fix embedding & mammouth-block relation