Feature/core implementation