Improved core identifiers and improved loader.