Add MetaBuilder & Refactoring