Extend datastores and spec for same - use JDK 1.7, 1.6 unreliable