Add more packages and some java hooks