Added extra solutions for different builds