[core] Improve resource management and fix timing issues

[core] Improve resource management and fix timing issues #59