Added lockable and trashable modules