Adding variables expansion