Nice to see these calls moved to the internals