Improve TenJava Command