Add mixin and include, handle more } scenarios