Additional building models and some optimizations