added @imports
fixed ordering after extends