Improve inject, runtomcat