Updated build procedure to use a common handler