Core change. Issue #12 and more