Refactored Guild
Added storabletype