Working on improving configuration to master 0.3