added separate files for different var types