Fixed variable types
Testing reimplementation of thread-splitting support