Environment is now optional