add latest features to forked Qi4j.