Updated Core code