Merged production and source versions for easier mantainability