Cleaning up imports
Fixed bucket container items. Fixes #57