Add includes. Add variations