Removed dependency on java1.7