Move definitions to earlier in the process
Version bump v1.0.3