Add build.and improve data interface