Updated Core
Created a solid Hook interface