Added Schema annotations to core