Refatoring, remove additional classes for simplicity usage