Implement core manager
Further fixes for language support