diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilder.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilder.java
index ce77dd67f9..cb51166c87 100644
--- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilder.java
+++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilder.java
@@ -29,6 +29,8 @@ import org.springframework.core.io.ResourceLoader;
  * db.shutdown();
  * </pre>
  * 
+ * TODO - should we replace schema/testdata with more general 'script' method?
+ * 
  * @author Keith Donald
  */
 public class EmbeddedDatabaseBuilder {
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java
index 534277a864..a96c753970 100644
--- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java
+++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java
@@ -23,6 +23,8 @@ import org.springframework.jdbc.datasource.SimpleDriverDataSource;
  * Encapsulates the configuration required to create, connect to, and shutdown a specific type of embedded database such as HSQLdb or H2.
  * Create a subclass for each database type we wish to support.
  * 
+ * TODO - introduce ConfigurableDataSource strategy for configuring connection properties?
+ * 
  * @see EmbeddedDatabaseConfigurerFactory
  */
 abstract class EmbeddedDatabaseConfigurer {