Updated Classes From Previous Version
Added Dependencies