Fixed imports
Mostly property handling