Added more to the gun system framework