Added data building tool