Split trigger building into more logical components