Manually added core files