Separated TPB file
Fixed separate file issue