[#3125] Added some more procedures and types