Improve variables inclusion on less build