Design details
Import fixes