WIP: Added some more parameter types