Swapped the order, so custom additions run last