additional structure
Started builder support