Finishing the Core code