Cosmetics
LA: Make builder much more complete