Move to java 7 concurrent datstructures