Added initial defines. Changed xml format for defines.