Added blobs & Cleanup