Initial add
Removed unused member
Added support for default imports