Added builder and table get and find