Better dotEnv handling