INFRA-105 - Extract functions