adds DURATION_SHORT and DURATION_LONG; using DURATION_SHORT in default Builder implementation
moving methods around