Feature/core logic enhancement