Adding more code to the core