UPDATED: better repository layer
ADDED: derby tools bundle