Updated entities...

Fixed import issues.