Feature/core 0.4.0