Core improvements