Added some more information to upload to the GPU to make it more flexible