Version 2.0

More dynamic template