Updated with Samba stuff and storage manager functions