Fixed Wundero's commit + added a few interfaces