Implemented wod source and removed unnecessary initWith... method