Added modules and updated inventory functions