Refactored Maven dependencies (EPD-62)