More variables included in several files, for better definition of objects