Initial adjustment for new SimpleDbLayer